fixed rollover cycle q handling

first test passes. #334 #355