Hack on jquery - need to fix soon