Bug fixing again