fix bug to previous commit