Fixed scheme bug (for testing)