Fix according to review 131. Related to #174