hrm, missing stuff... see if this is sufficient to fix it