Bugfix #809
Merge remote-tracking branch 'glorf/bugfix2'