Fixing Joachims bugs ;)