Fixing bad practice.