Fixed install/upgrade issue (caused by #621)