Speeding up bridge client. Fixes #4