Add assertion for min roll, fix bug