Fixes #2539 by checking if extension was specifically supplied as an option.
Added additional needed line, clarified variable