Fix #33, #34.