fixed Pawel  commits