Fix mark as read behaviour