fixed issues with shortener