Fix access for latest cs