solves some issues with #736
Merge pull request #1097 from OCHA-DAP/marianne-sprint

solves some issues with #736