Added fix for 6.1 release