New mechanism for dealing with final block