closes tp #553