* adjust for task #505.