Handle extra-time & pso

This how we work with an API without documentation: learn when it
happens :)