*really* fix issue #5, finally...