White Bug fix