Fixing bugs :-)