#65 fixed