Trying to fix white-first case