Fix roll again here logic