Modifs for bug