Workaround on some URL constructions