This seems to resolve #21