Try to fix compexity