I assume the last fix by Keldorn is sufficient?