See #271 (Point to refactor)