Should work fixes #4