130809 J.M.Park Bug fix