Fixes Maestro issue # 200