GH #221 - Backporting the fix to support/1.1