case 3098 - More clean code.