null check
fixed color by mappings