Possible fix to CriticalPoints class