Possible fix to Issue #129

Workaround for the hunger on transfer bug.