Fixed Black/White color bug