FIXED: message loading issue