#48 fixes #60