Added hack to avoid redirect