=> implement #438 ?