fix #873
Merge pull request #874 from martinhath/master

fix #873