Greg found/fixed a bug but doesn't have push permissions so here it is
from me instead