better checks for multipoint case