Fixed hasan bugs