issue #22 fix attempt