better #77 fix
fixes #76