Fix #146. Fix #148.