Fix bug introduced by 18c1320
Fix bug introduced by 69d4ce7