Fix critical for build