Yeah need to change mining code, the current solution is really bad.