should fix issue #25