Fixing Pascal's bugs.