White Event Bug fix