Fix #101. Breaks #83.