Fixing #71