Respects CTP during fallback
Merge pull request #1004 from yurydelendik/fallback

Respects CTP during fallback