Code

Apply fix for Trac #3558