Hack around nms bug