fix custom location support