Minor Bug - code reduction (commonOptions)