or wait for the patch mmalecki is working on