fixed NP issue, need to check tho
https://github.com/OHI-Science/issues/issues/270
Merge branch 'dev' of https://github.com/OHI-Science/ohi-global into dev