Commit on behalf of Grzesiek Kowalik