a09d7f3
a09d7f3 fixed issue #349, but introduced a new regression. This commit reverts a09d7f3, and fixes #349 in a different way