3.6.3 bugs are wrongly moved to MODIFIED