Foundation bug fix