fixes #598
fixes #873
Merge pull request #896 from OCHA-DAP/arti-bug-fixing

Arti bug fixing