...actually fixed issue #2 this time, honest.