rework, bug fix