fix for buggy studio