fix issue 428?