Bug of the last commit fixed