Fixed the push targeting problems