fixes infufg/sade#70 infufg/sade#71 infufg/sade#72