fix issue 406