Fixes #3707 final fix and tested on browsershots.org