Fixed 3rd try. See previous commit.