Fixed 7.2 compatibility