Another fix related to the last commit