modification for bug