WIP: more robust quickfix handling