Maek some fix