Updated to handle maguro's behaviour.