Fix for sceleton