Fixed and tested both cases, thanks.