Fix for #19