Fixes #436 (or at least it should..)