Fix #149 on github