Fixes #348 A new Fix.