Added bugfix
Added bugfix


Former-commit-id: d949c7e9bb648a053e050935fc8c706148553c4f [formerly 1f2dcea14dce575421813045fc4dd3634780bb09] [formerly 4b78d47372f0c9402a33f83fd97faad62a3b7090]
Former-commit-id: 90b2427573ecefc6d65f4cf4129d17add9fc4fc8 [formerly 0002cb903e3d7f30948884000155149bb4c3e35f]
Former-commit-id: 2dd4b64506c700302f4974e65d1d0c5e6f5207a0
ryansb/ofCourse,ritjoe/ofCourse,sctjkc01/ofCourse,ryansb/ofCourse,sctjkc01/ofCourse,ritjoe/ofCourse