Added DartEditor workaround