Bugs fixing again