Fixed problems with full param analysis