#48 fixed