Apply patch 3feb3b3...
possible solution for issue #215