App Builder fix #2