Fixed 2d problems.