Fix: don't throw away initial options