Fix #645
Merge pull request #646 from bootstraponline/master

Fix #645