Fix for last commit