#98 fixed