bug fix by Kanna