Fix for Bounty 407

https://assembly.com/coderwall/bounties/407