Find a better solution