Fix for bidirectional support.