Fix for Kim