fixing last part