Code

Apply follow-up patch for 1797 from mba