Fix Bug #139