Fixed X/Y coordinate issues