Fixing bug: multiple points