Fix after review No. 1

Author:    Norman Jäckel <my-git-mail@normanjaeckel.de>