Added hack to bypass image processing when not needed.