Fix options not being respected