#96 fixed