[BUGFIX] Repaired previous broken commit