Workaround for #53 and bugfix for #63