Quick fix for the last commit