fixes issue #3284

https://prototype.lighthouseapp.com/projects/8886/tickets/3284
Merge remote-tracking branch 'origin/issue-3284-fix' into master-w-updates