I think we should use the ugly solution