Add feature requested in #477