fixes #10 within bugfix for #12