Stacky url bugfix

rebased with master.