HOTFIX: change threshold 10 --> 30