Fix for make16