Bugfix on prev. commit