Loc Nguyen

There is a subtle bit of tech debt in the code, a very old bit of debt. It can lead to some problems in the future. This changes some code...