Hopefully offer a bugfix for #17.