bugfixes: tag fixed, working well