fixes #309 again.