Fixed for 6.1