Fixed due @Stof comments