Fixing issues with magical record