Fixed code after Kodiak's push