Implemented suggestion of Rob Tillaart