Fix for #173