Working on https://github.com/Antergos/Cnchi/issues/63