Fixed 5.3 compatibility