Bug fix. Testing...