small improvement shut still broken