Fix issue created during code cleanup