xWard fixed bugs
Bug Fix