Fixing Type. !!!