Possible fix for #23