Add fix noted by Jens Seidel