UCLA parameter fix

Added a new option to ensure that UCLA parameter doesn't get overriden
anymore.