hotfix color bugs