fix #41 :: changed to tags for consistency