Fixed repeating on demand restricting
2.1.16 beta