Fixed the issues with oldMessage