Fix for a same bug mentioned in last commit