Fix #60 -2