Update fix bug #508