Bugfix of the previous commit: 3558b1959dfbf87013134520828283b021bdb84d
Bugfix of the privious commit: a45fdd8864446433238c284efe81764732c1cce2