Fix for #138