Possible fix for #16