Completing Fix-137