getting tristan's bug fix