fixed bug with redirects
Merge commit '3a390cb'

* commit '3a390cb':
  fixed bug with redirects