Moving feature disabling to the correct spot