klayout fixed upstream