This indeed solve the problem, just hope Apple would solve this properly.