Fix some complex class