Previous fix was wrong because it called getKeyword() outside the hasKeyword() check. Current version (like original code) uses the short-circuiting behaviour of && to ensure this.