Fixes the wrong update messages bug