fix issue50.