#38 - Fix redirect loop