Fixed issue #74 on Studio