Fixed issue#569 in webmaker-app