[TASK] Don't force requestUpdate
[TASK] Avoid double method call