Tentatively fix #129