App Builder fix