Changed to compliance with 1.6.