Changed to work with Meteor 0.6+