Possible fix for #21 and tests