More test. Fix bug