Fixed critical bug in xavier