Support for 2.6
Be more clear in tags