fixed issue 92