Reverted "Fix for issue #149"
because it was broken again after commit 7ebba6abaa66abda690dcdb87248dfcb0c1dedc6