added lost changes from 4fb8d6f2440fd69e1b4659b83874bcffe6450b07 commit