takemura bug fix