Fixed on demand restricting asking again

Closes #1447