Fix for #520
Merge pull request #522 from dbabokin/broadcast

Fix for #520