[Pending testing] Hotfix: Images with spaces