Fix special cases