fixing for 5.2