Fixed handing of http sources