Fix (for azure storage context)