I'm gonna remove them for now, until a solution is found