Fixes bug 158 from Nelson