Fix traits