[Chorem-commits] 02/03: Fix refactoring