hopefully fixes #459