Solved combi bugs