Workaround JavaScript issue