Fix #64. Fix #153