Correction accroding issue #170