roll model logic fix