Fixed issue with deactivating message