fixed mixing 'where' keyword