mostly hacky fix for #177's blocker