Still trying to fix bug