Fix for 6514