Fixing embarassing errors