(Hopefully) fix issue #645