Bug Report_2.13 by Franklin

Bug Report_2.13 by Franklin