Use more generic solution