Bug fix / modernization.