Fixed Cypher bug