Fixed convention mapping bug