App Builder fix #3