fixed Tristan's bug