Bug fix extended