Fix for issue 4155

https://github.com/emberjs/ember.js/issues/4155