Fixed continuation issue x 2