further fix or improvements