Fix #147
Merge commit 'dee44ee2e1a8a34a1a38eb703460cf4ba80c8d26'