Readmodel fix