improved work with bugs