Fix for #14