Second fix to klems