Fixed ahare issue