Fixed invalid map references