Fixing Foundation bug