Bugfix, better commenting