fix "PROD error"
Merge branch 'tocarun2013' of https://github.com/leochen41/activerun into tocarun2013