Fix for the new cypher injection issue