Fixed disabled and enabled bugs