This should help with first round bug