Fix #90 introduced by #89