Fixes #124. This time it should be completely solved.
Merge pull request #126 from frmwrk123/fix/redirect

Fixes #124. This time it should be completely solved.