fix issue with studio mode