Bug fix for bundle communication problem originated in the previous
commit