guarantor bug resolved