Now it have the missing files [bug #3650 and #3651]