Skin query fix