fix last stuff (finaly)...