forward port fix unread to master