Retry hotfix

This is a hotfix for #221