Additional fix for best practices