Fix retarded issues