Type fix for 4.6