Much better fix over previous commit.