Fix for #133