Fix for auto selection of first parameter (at last)