Cleaned up Foundation bug