Fix #33.
Fix #31, #32.