Moved tag line for #74 and fixed #84