Fix legacy options handling

Conflicts:

	CHANGELOG