#166 removing none rollover