Fixup part-2