Big fix from last commit