Fixed issue with redirect