Still attempting to fix bug