Is there a better way to handle this?