fixes to disable