This should work better for #9