#1581 - CS and method restore