Flash messenger fix