Fix problem from the last commit