More fix for #2474 which covers keywords module too.