Remove this code, will try to find a real solution