Class expression fix