Bug fixes 2062 and 2070