Heteroatom problem solved