Fixed errors with options