Fix splitting make and model