Fixed a case #26