Fixed 7.4 compatibility