Fix #53 - jian