Quick fix for Kashirina