fix few issue