[#66065306] another take at enforcing limits