Fix #857
Merge pull request #860 from bootstraponline/857

Fix #857