Improved substate closing