Small fix which should be merged with the previous one.