Fix options. Closes #2116.