WIP: FIXME: params are being duplicated