some better multi-client compatibility