Added workaround for https://github.com/meteor/meteor/issues/3096