fix #136 by @homeway