Fixes #282
Fixes #281
Merge pull request #284 from buddycloud/issue-281

Fixes #281