Fixed bugos implementation of ddbb219273e1d5d6085e7c59a0fad8febd8bc4ec (#103)