still broken, switching to master and praying the problem isn't there also...