v1.54 - null image fix