Cleaned up fix for #208