Fix .within bug