#390 Fixing fallback

@AlexandrTsumarov-ScienceSoft please review and merge