FIFO-44: resolved, FIFO-45: resolved