Mind adding a TODO to fix this in the future in a more elegant way?