fixed issue 77