Fix using user home dir. TODO: test