Fix skeleton states