Before fix bug