Hotfix made turning around time shorter