really fixes #8