Few bug fixed