semi fixing...