Update and Fix the Bug

Common….