did some fixes for if block