Fix foundation issue