Correction issue #62, #5