Fixing bugs really close