Fixed error caused on last commit