Another solution, just wait for 2.1.