Fixed 1.7.2 incompatibility