A fix for the last commit