Updated PR

you need to keep this defer in here or it breaks on loading on openshift and remote servers.