Fixed coordinate issues