DFM-1: Fixing NPE with coordinates