Fix #195 and close pull #199