add FIXME and remove redirect