should fix issue #15