Added support when the home directory contains spaces