reverting piece-tucking fix (close #32)