Fix #134 #136