fixing and fixing again