Fix business rules