Resolve CS pb #130