Added missing behaviour