Draft: Small fix for malfuncioning pivy