Rudimentary fix for #17