Really fixed issue #21 this time.