Resolve "fixing dynamic instructions"

Closes #1027

See merge request !1719

(cherry picked from commit 303fec54)

db88a288 corrected version check on firefox mobile