Fix behaviour