#fw_core-6 fixed

#fw_core-6 fixed