t13: added feature requested by client