Bug Fix After the Update