updated from upstream
corrected the FB (support back to kernel from module)