Make parsing more robust on docker run