Rough fix for combo after done bug