Note to self: test before commit. This should fix issue #42 for real (not tested on 4.6, still).