- By Benjamin. Stuff for bug fixed.