Fixed regression bug of issue #223