#78 correct but half-baked workaround