Hot fixes a tag which allows incorrect methods to be called