Is this fixing a bug or improving the code?