Skeletor code 1.6 fix