Refs #109: must be revised