Fix for upstream issue #13. Now works with Meteor 0.6.0