Fixed fw issue