Identified slight bug on UI updating