Fix extending of options