Fix image class for cyclone5 until fixed upstream