Fix BlueBalls

Change-Id: I39bb3509174024c88cccf9847214ff1379c9cb3b