stores-q/r infinite loop.. need a fix