Behavioural Pattern Fix one