Feature #1483: Fix util.cc