Seems like a no-brainer, just wait until the next version