Quick fix on roll checks