Fix for the last commit