Appbuilder related fix