Bug Fix (from Mr.Takanashi)