fixed bug on mappings, no longer applicable to null values