Add one more check to ensure minimum count is met (#1903)

Add one more check to ensure minimum count is met (#1903) #1633