Fixing #62 again