Good point. Removed that code duplication as well.