Fixing bug in last commits