Hacky fix until $*HOME/homedir implemented