Fixing bug on development