PAPI-1086: First developments - fix 3