Fix handling of source combo #3185