Bug fix: