Fixing flavor loss issues