fixes #136 introduced by #112, should still be valid as fix for #60