Bug fix for testing