Moved current dir reading to after control update has occurred.