updated bug fixing