Maybe a better solution? [ci skip]