'fix' for #201 maybe