Fixes #348 A new Fix. under development branch