Fixed bug with complete event
Changes in comments