Temporary fix for skinning