A new workaround for the _internal resolve image syntax difference between 6.1 and 6.5