Fix #141