Addresses ticket 2065