bug fix. Mappings work properly now.