Possible fix found. Testing necessary.