Is there a better solution?