Trying to improve the redirect, let's see if works