Fixing bug :D