Hopefully fixed issues.