Bug fix related to last commit.