Parameters selection bugfixing.