Merge pull request #4196 from arnova/sub_fallback