Attempt to fix skin bug #35