Fix code accoreding to @tadatuta notations