fixes to disabled feature