now fixes #34