Fix for ENYO-3308

See JIRA entry at https://enyojs.atlassian.net/browse/ENYO-3308.