Comment by freitasm

I wonder how many bugs will be introduced with these fixes...