Fix for invalid yield