[bug] Eliminated an implementation flaw