fixing last issue