Minor bugfix of the prev. commit