Updated to work with meteor 0.9.2