Relates to https://github.com/ebiwd/EBI-Framework/issues/115 and https://github.com/ebiwd/EBI-Framework/issues/77
