fixed Skin related bugs