Fix for edge cases where the final block specifier is not caught.