Fix babayaga issue