fix: re-introduce accidentally dropped changes of #35 #36

Closed jdrueckert closed 4 years ago