add a hack to fix bug #130