craft-s fix