Bug fixed
Keywords dynamically checked