Hotfix patch v1.1.7