First fix for testing