Improve bang handling