Utilities fix