Fix for debug/coordinate mode