Fixes issue with incorrect use of _kwps_hash and _kwps_group