closed #180, closed #223