fix bugs maybe ?