Trying to fix stupid bugs