Bugfix: unneccessary code removed