Corrected bug with empty keyword