Bugfix: forgot to adjust some stuffs