Wip with hack, it's a dev branch ;)