v1.5.5 - Hotfix for long loading times