Fiedex bugs

Signed-off-by: robertomorati <robertomorati@gmail.com>