Revert "fix #393"

Due to an error i uncommit the morgans commit #259

This reverts commit f2b1cbd578cd5dfffc15e4960bfd45d955826ad2.
fix #393