Fixing wrong message at wrong time