Fix for #60