address @tychoish github comments