Fix issue #52 using some jQuery!