#OF-19 messages fixed