Fixed broadcasts

Fixes #36