A simple bugfix - this looks almost stable :)