Fixing Causeway bug reported by NE2