Fix for #17