iss #22: tmp commit ...