updated to work with meteor 0.6+