fixed wtf mapping