applying hotfix directly to production for #211, #213