re-fixes issue #77 redo