fixed bug in v1.2.28