Maybe this should be in an other PR?