Close #12
JQuery fix