If its bugging you this much then why not just stay away from his place ? Can he go to yours ?