Trying to fix up the handling of motion images