Added a fix for the Studio with unit test