fix 540 & 720+