Fixed bugs. (safe)