[#0017095] Corrections to #0017095