Fix behaviour regression