Switched to my branch of mspec until my bug-guard patch gets merged