Tags not handled - fix issue #2