bug fixing again