Bug fix related to the previous commit