Fix #139