#503 reproduced
#503 fixed
1.6.1
#503 one more bug
#503 fixed
#503 polished
#503 back to snapshot