fixed few issue