Another fix for best practices