fix for scheme