Bugfix: If deploy_dir is specified, use it always