Fixed bugs, boader always being set and cannot unset