Improve previous commit

In a hurry at the airport is not a good time to commit...

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>