just for tom: fix #818