Business rule bugfix