Bugfix: Moved a line too much in the subroutine