Kais suggested js tweak