#64 fixed again