Fix for not allowed mapping values