Fixed bug. Still not working.