fixed for nikita