should fix overwatch bug