By Juanpri, closing https://github.com/XIMDEX/ximdex/issues/18