Fixing for 5.3 syntax