Implements a real fix for 4736