Fix too much complexity