Fixed suffix removal for non png images.