Fix bug with wrong routine name for Close button