Improve readability of previous bugfix