Slightly more elegant way of doing the same broken thing