Solves the issue, but is this the best we've got?