fix bug on dev