Issue hotfix 1.4.2