Starting to fix problem, which is commented.