trying to fix last issue