reverted last commit. It was not a fix; caused all values to be nil