Fix Image URL bugs.(Thanks for Peter)