fixing xbaya issues