Added post message fix