Fixing #82