Fix #474 issue 2