Feature set bugfix