Working on hornet issue