+ fix last commit & some testing ... :)