Fix on demand negative enable

Fixes #1495