Major bugfix, was broken