Changed  to  so it will work in b2evolution 5
Fixed merge