Messages fix in prepare