Trying to fix weird issues.