Fixing [#61]