More stringent check for enabling, removed superfluous die