Bug fix attempt #2