add automatic tagging to prevent issues like #58