fixed multiple issue in one commits