Fixed .within() bug