Not sure how to hendle thses bugs