- By Benjamin. Fixed bug for various reverted bugs.