resolve few bugs